merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 7 Dec 2012 11:49:09 +0000 (20:49 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 7 Dec 2012 11:49:09 +0000 (20:49 +0900)
commited134ea42507ac98d0a4c756fb9711cff07b755d
tree5fd2251c698cec71cd59cdb56bf89274fd67e224
parent0e69a0ad124a5dfaf3597b641222665dbf49b547
parentcc5e97cd6cb56a979f7a01071ae86ff4c27977e1
merge emacs-24